merge trunk
authorKenichi Handa <handa@m17n.org>
Fri, 28 Jan 2011 11:32:48 +0000 (20:32 +0900)
committerKenichi Handa <handa@m17n.org>
Fri, 28 Jan 2011 11:32:48 +0000 (20:32 +0900)
commitd9b8145e577063705999f9b3215ce9aba916c4f5
tree04db667962aa3b90b85ea1cdd75ab55e6c58483f
parent937a1e9615407e0556911b1c4b095146bfac7429
parent5bda7100ab52f18fc19cb867b34079a380e4a2f5
merge trunk